From 6f6ed1e4af11239e325d5ccb80a35f1bd1454c7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Fri, 6 Mar 2020 18:54:37 +0100 Subject: [PATCH] demos/node-editor: Add common_cflags to build And fix the generated warnings --- demos/node-editor/meson.build | 4 +++- demos/node-editor/node-editor-window.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/demos/node-editor/meson.build b/demos/node-editor/meson.build index c08fdd4bc9..d09b4bd7a5 100644 --- a/demos/node-editor/meson.build +++ b/demos/node-editor/meson.build @@ -13,7 +13,9 @@ executable('gtk4-node-editor', node_editor_sources, node_editor_resources, dependencies: libgtk_dep, include_directories: confinc, - c_args: ['-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir())], + c_args: [ + '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir()) + ] + common_cflags, gui_app: true, link_args: extra_demo_ldflags, install: false) diff --git a/demos/node-editor/node-editor-window.c b/demos/node-editor/node-editor-window.c index 491b956c41..b9b28afd81 100644 --- a/demos/node-editor/node-editor-window.c +++ b/demos/node-editor/node-editor-window.c @@ -425,17 +425,17 @@ save_response_cb (GtkWidget *dialog, &error); if (error != NULL) { - GtkWidget *dialog; - - dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - "Saving failed"); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + GtkWidget *message_dialog; + + message_dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))), + GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "Saving failed"); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog), "%s", error->message); - g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); - gtk_widget_show (dialog); + g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL); + gtk_widget_show (message_dialog); g_error_free (error); } -- 2.30.2